<<<<<<< HEAD
||||||| constructed merge base
=======
>>>>>>> updated walking map